From: Kenichi Handa <handa@m17n.org>
Date: Thu, 2 Oct 2003 02:06:08 +0000 (+0000)
Subject: (fs_load_font): Don't set fontp->font_encoder to NULL
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~25325
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=0efa75d0b4b35065f7e23d98caad3ec06032643b;p=emacs.git

(fs_load_font): Don't set fontp->font_encoder to NULL
before calling find_ccl_program_func.  Call find_ccl_program_func
only when fontp->font_encoder is not NULL.
---

diff --git a/src/fontset.c b/src/fontset.c
index 996631f1a59..990c1bbb9fa 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -690,9 +690,7 @@ fs_load_font (f, c, fontname, id, face)
 	}
     }
 
-  fontp->font_encoder = (struct ccl_program *) 0;
-
-  if (find_ccl_program_func)
+  if (! fontp->font_encoder && find_ccl_program_func)
     (*find_ccl_program_func) (fontp);
 
   /* If we loaded a font for a face that has fontset, record the face